Merge the latest code into master #410
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…-1.1.0-webank # Conflicts: # exchangis-job/exchangis-job-server/src/main/java/com/webank/wedatasphere/exchangis/job/server/ExchangisJobExecuteAutoConfiguration.java
…x-engine Dev 1.1.0 datax engine
…ion file location
…gis into dev-1.1.0-job-config
Set ES data source fields to be non-editable
….1.0-job-config # Conflicts: # assembly-package/config/exchangis-server.properties
Fixed some bugs in projects、tasks and log.
…tend_xxzhou Fixed some web bugs in projects、tasks and log
# Conflicts: # db/exchangis_ddl.sql # docs/en_US/ch1/exchangis_appconn_deploy_en.md # docs/en_US/ch1/exchangis_deploy_en.md # docs/en_US/ch1/exchangis_sqoop_deploy_en.md # docs/zh_CN/ch1/exchangis_deploy_cn.md # docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md
wushengyeyouya
requested changes
Aug 18, 2023
|
|
||
| ## 5. Linkis DataX 引擎安装部署 | ||
|
|
||
| 如您想正常执行 Exchangis1.1.2 的 DataX作业，还需安装 Linkis DataX 引擎，请参考: [Linkis DataX 引擎插件安装文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_datax_deploy_cn.md) |
There was a problem hiding this comment.
It has been changed to no version number.
# Conflicts: # assembly-package/config/dss-exchangis-server.properties
jefftlin
force-pushed
the
dev-1.1.2
branch
7 times, most recently
from
a78f2a7 to
533e18a
Compare
wushengyeyouya
requested changes
Aug 23, 2023
|
|
||
| ## 4. Linkis Sqoop 引擎安装部署 | ||
|
|
||
| 如您想正常执行 Exchangis1.0.0 的 Sqoop作业，还需安装 Linkis Sqoop 引擎，请参考: [Linkis Sqoop 引擎插件安装文档](https://linkis.apache.org/zh-CN/docs/latest/engine-usage/sqoop) | ||
| 如您想正常执行 Exchangis1.1.2 的 Sqoop作业，还需安装 Linkis Sqoop 引擎，请参考: [Linkis Sqoop 引擎插件安装文档](https://github.com/WeBankFinTech/Exchangis/blob/dev-1.1.2/docs/zh_CN/ch1/exchangis_sqoop_deploy_cn.md) |
There was a problem hiding this comment.
It has been changed to the relative path.
jefftlin
force-pushed
the
dev-1.1.2
branch
5 times, most recently
from
cc64688 to
fd47d22
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What is the purpose of the change
(For example: Exchangis-Job defines the core ability of Exchangis, it provides the abilities of job management, job transform, and job launch.
Related issues: #50. )
Brief change log
Verifying this change
Does this pull request potentially affect one of the following parts:
Documentation